Switch to unicode-data 10

diff --git a/debian/changelog b/debian/changelog
index a5e62493bd34222abf48f8f3a5ad6d07a60eb48b..e3bd95246dfc08919383049ebef3b660aed6db82 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 utf8proc (2.1.0-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Switch to unicode-data 10
 
  -- Graham Inggs <ginggs@debian.org>  Fri, 07 Jul 2017 17:18:34 +0200
 

diff --git a/debian/control b/debian/control
index e968d92e4d6d86ed15fe192544a075931cc46f6c..b24d8434e5b3506689161d0c834cafbdf9608540 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Maintainer: Debian Julia Team <pkg-julia-devel@lists.alioth.debian.org>
 Uploaders: Peter Colberg <peter@colberg.org>, Graham Inggs <ginggs@debian.org>
 Build-Depends: debhelper (>= 9),
                perl,
-               unicode-data (<< 9.1),
-               unicode-data (>= 9.0)
+               unicode-data (<< 10.1),
+               unicode-data (>= 10.0)
 Standards-Version: 3.9.8
 Section: libs
 Homepage: http://julialang.org/utf8proc/

diff --git a/debian/patches/use-unicode-data.patch b/debian/patches/use-unicode-data.patch
index ce741f20e3ded61077fc42fc69f602d5b794745d..ce709065a41332ad1886d72b66cc09fe50fa0a2d 100644 (file)
--- a/debian/patches/use-unicode-data.patch
+++ b/debian/patches/use-unicode-data.patch
@@ -3,12 +3,18 @@ Description: Use unicode-data instead of downloading external files
  provided by the packages unicode-data and ttf-unifont, respectively.
 Author: Peter Colberg <peter@colberg.org>
 Forwarded: not-needed
-Last-Update: 2015-11-01
+Last-Update: 2017-07-07
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/data/Makefile
 +++ b/data/Makefile
-@@ -25,6 +25,6 @@
+@@ -20,13 +20,13 @@
+       $(RUBY) data_generator.rb < UnicodeData.txt > $@
+ 
+ # GNU Unifont version for font metric calculations:
+-UNIFONT_VERSION=9.0.04
++UNIFONT_VERSION=10.0.02
+ 
  unifont.ttf:
 -      $(CURL) $(CURLFLAGS) -o $@ $(URLCACHE)https://mirrors.kernel.org/gnu/unifont/unifont-$(UNIFONT_VERSION)/unifont-$(UNIFONT_VERSION).ttf
 +      cp /usr/share/fonts/truetype/unifont/unifont.ttf $@
@@ -17,7 +23,15 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 -      $(CURL) $(CURLFLAGS) -o $@ $(URLCACHE)https://mirrors.kernel.org/gnu/unifont/unifont-$(UNIFONT_VERSION)/unifont_upper-$(UNIFONT_VERSION).ttf
 +      cp /usr/share/fonts/truetype/unifont/unifont_upper.ttf $@
  
-@@ -40,24 +40,24 @@
+ %.sfd: %.ttf
+       $(FONTFORGE) -lang=ff -c "Open(\"$<\");Save(\"$@\");Quit(0);"
+@@ -35,31 +35,31 @@
+       $(JULIA) charwidths.jl > $@
+ 
+ # Unicode data version
+-UNICODE_VERSION=9.0.0
++UNICODE_VERSION=10.0.0
+ 
  UnicodeData.txt:
 -      $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/UnicodeData.txt
 +      cp /usr/share/unicode/UnicodeData.txt $@
@@ -50,3 +64,5 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 -      $(CURL) $(CURLFLAGS) $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/auxiliary/GraphemeBreakTest.txt | $(PERL) -pe 's,÷,/,g;s,×,+,g' > $@
 +      $(PERL) -pe 's,÷,/,g;s,×,+,g' < /usr/share/unicode/auxiliary/GraphemeBreakTest.txt > $@
  
+ clean:
+       rm -f UnicodeData.txt EastAsianWidth.txt GraphemeBreakProperty.txt DerivedCoreProperties.txt CompositionExclusions.txt CaseFolding.txt NormalizationTest.txt GraphemeBreakTest.txt CharWidths.txt unifont*.ttf unifont*.sfd